From 6a5d0809a678af38e384db20a7edcb62a1b8d28a Mon Sep 17 00:00:00 2001
From: robertl <robertl>
Date: Thu, 20 Apr 2006 23:19:26 +0000
Subject: [PATCH] Pick up missing pieces for Windows build of new jeeps layers.

---
 Makefile.in       | 2 +-
 jeeps/gpsserial.c | 5 ++++-
 jeeps/gpsusbwin.c | 6 ++++--
 route.c           | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 63abbd185..f48e7e5e4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@ VPATH = @srcdir@
 VERSU=1_2_8
 VERSD=1.2.8
 # YYYYMMDD, please, if beta.
-RELEASE=-beta20060405
+RELEASE=-beta20060420-ds
 VERSIONU=$(VERSU)$(RELEASE)
 VERSIOND=$(VERSD)$(RELEASE)
 
diff --git a/jeeps/gpsserial.c b/jeeps/gpsserial.c
index cfc977054..543766dd2 100644
--- a/jeeps/gpsserial.c
+++ b/jeeps/gpsserial.c
@@ -57,7 +57,10 @@ char *rxdata[] = {
 #if defined (__WIN32__) || defined (__CYGWIN__)
 
 #include <windows.h>
-#include "gpsserial_win.h"
+
+typedef struct {
+        HANDLE comport;
+} win_serial_data;
 
 /*
  * Display an error from the serial subsystem.
diff --git a/jeeps/gpsusbwin.c b/jeeps/gpsusbwin.c
index b14ca2fd0..c4c984e14 100644
--- a/jeeps/gpsusbwin.c
+++ b/jeeps/gpsusbwin.c
@@ -32,7 +32,6 @@
 #include "gpsapp.h"
 #include "garminusb.h"
 #include "gpsusbcommon.h"
-#include "gpsusbwin.h"
 
 /* Constants from Garmin doc. */
 
@@ -50,6 +49,9 @@ DEFINE_GUID(GARMIN_GUID, 0x2c9c45c2L, 0x8e7d, 0x4c08, 0xa1, 0x2d, 0x81, 0x6b, 0x
 #define IOCTL_GARMIN_USB_BULK_OUT_PACKET_SIZE CTL_CODE \
 	(FILE_DEVICE_UNKNOWN, 0x851, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
+typedef struct {
+        int booger;
+} winusb_unit_data;
 
 static HANDLE *usb_handle = INVALID_HANDLE_VALUE;
 static int usb_tx_packet_size ;
@@ -202,7 +204,7 @@ gusb_init(const char *pname, gpsdevh **dh)
 	gusb_register_ll(&win_llops);
 
 	if (strlen(pname) > 4) {
-		if (0 == strcmp(portname+4, "list")) {
+		if (0 == strcmp(pname+4, "list")) {
 			req_unit_number = -1;
 		} else {
 			req_unit_number = atoi(pname+4);
diff --git a/route.c b/route.c
index 65cae1264..72685e076 100644
--- a/route.c
+++ b/route.c
@@ -455,8 +455,8 @@ void track_recompute(route_head *trk)
 	first.creation_time = 0;
 
 	QUEUE_FOR_EACH((queue *)&trk->waypoint_list, elem, tmp) {
-		this = (waypoint *)elem;
 		double tlat, tlon, plat, plon, dist;
+		this = (waypoint *)elem;
 		/* gcdist and headin want radians, not degrees */
 		tlat = RAD(this->latitude);
 		tlon = RAD(this->longitude);
-- 
2.30.2